add photo_from field for GroupPhotoInfo and return photo_from for some api
Brightcells
共有 4 个文件被更改，包括 32 次插入 和 2 次删除
+ 19
- 0
group/migrations/0017_groupphotoinfo_photo_from.py
@@ -0,0 +1,19 @@ |
||
| 1 |
+# -*- coding: utf-8 -*- |
|
| 2 |
+from __future__ import unicode_literals |
|
| 3 |
+ |
|
| 4 |
+from django.db import models, migrations |
|
| 5 |
+ |
|
| 6 |
+ |
|
| 7 |
+class Migration(migrations.Migration): |
|
| 8 |
+ |
|
| 9 |
+ dependencies = [ |
|
| 10 |
+ ('group', '0016_auto_20160321_1535'),
|
|
| 11 |
+ ] |
|
| 12 |
+ |
|
| 13 |
+ operations = [ |
|
| 14 |
+ migrations.AddField( |
|
| 15 |
+ model_name='groupphotoinfo', |
|
| 16 |
+ name='photo_from', |
|
| 17 |
+ field=models.IntegerField(default=0, help_text='\u7167\u7247\u6765\u6e90', verbose_name='photo_from', choices=[(0, 'APP \u5efa\u7fa4'), (1, 'SESSION \u5efa\u7fa4')]), |
|
| 18 |
+ ), |
|
| 19 |
+ ] |
+ 10
- 0
group/models.py
@@ -123,6 +123,14 @@ class GroupUserInfo(CreateUpdateMixin): |
||
| 123 | 123 |
|
| 124 | 124 |
|
| 125 | 125 |
class GroupPhotoInfo(CreateUpdateMixin): |
| 126 |
+ APP_GROUP = 0 |
|
| 127 |
+ SESSION_GROUP = 1 |
|
| 128 |
+ |
|
| 129 |
+ PHOTO_FROM = ( |
|
| 130 |
+ (APP_GROUP, u'APP 建群'), |
|
| 131 |
+ (SESSION_GROUP, u'SESSION 建群'), |
|
| 132 |
+ ) |
|
| 133 |
+ |
|
| 126 | 134 |
group_id = models.CharField(_(u'group_id'), max_length=255, blank=True, null=True, help_text=u'群组唯一标识', db_index=True) |
| 127 | 135 |
user_id = models.CharField(_(u'user_id'), max_length=255, blank=True, null=True, help_text=u'用户唯一标识') |
| 128 | 136 |
nickname = models.CharField(_(u'nickname'), max_length=255, blank=True, null=True, help_text=u'用户群组昵称') |
@@ -135,6 +143,7 @@ class GroupPhotoInfo(CreateUpdateMixin): |
||
| 135 | 143 |
photo_thumbnail_h = models.IntegerField(_(u'photo_thumbnail_h'), default=0, help_text=u'照片缩略图高度') |
| 136 | 144 |
comment_num = models.IntegerField(_(u'comment_num'), default=0, help_text=u'照片评论数量') |
| 137 | 145 |
thumbup_num = models.IntegerField(_(u'thumbup_num'), default=0, help_text=u'照片点赞数量') |
| 146 |
+ photo_from = models.IntegerField(_(u'photo_from'), choices=PHOTO_FROM, default=APP_GROUP, help_text=u'照片来源') |
|
| 138 | 147 |
|
| 139 | 148 |
class Meta: |
| 140 | 149 |
verbose_name = _(u'groupphotoinfo') |
@@ -174,6 +183,7 @@ class GroupPhotoInfo(CreateUpdateMixin): |
||
| 174 | 183 |
'avatar': self.avatar, |
| 175 | 184 |
'comment_num': self.comment_num, |
| 176 | 185 |
'thumbup_num': self.thumbup_num, |
| 186 |
+ 'photo_from': self.photo_from, |
|
| 177 | 187 |
'created_at': self.created_at.replace(microsecond=0), |
| 178 | 188 |
} |
| 179 | 189 |
|
+ 2
- 1
group/views.py
@@ -866,7 +866,8 @@ def pai2_home_api(request): |
||
| 866 | 866 |
'avatar': row[13], |
| 867 | 867 |
'comment_num': row[14], |
| 868 | 868 |
'thumbup_num': row[15], |
| 869 |
- 'created_at': row[16], |
|
| 869 |
+ 'photo_from': row[16], |
|
| 870 |
+ 'created_at': row[17], |
|
| 870 | 871 |
} for row in rows] |
| 871 | 872 |
|
| 872 | 873 |
return JsonResponse({
|
+ 1
- 1
utils/sql/raw.py
@@ -4,7 +4,7 @@ PAI2_HOME_API = ( |
||
| 4 | 4 |
r"select " |
| 5 | 5 |
r"T1.group_id, T2.group_name, T2.group_default_avatar, T2.group_avatar, T3.id, T3.photo_path, T3.photo_w, " |
| 6 | 6 |
r"T3.photo_h, T3.photo_thumbnail_path, T3.photo_thumbnail_w, T3.photo_thumbnail_h, T3.user_id, T3.nickname, " |
| 7 |
- r"T3.avatar, T3.comment_num, T3.thumbup_num, T3.created_at " |
|
| 7 |
+ r"T3.avatar, T3.comment_num, T3.thumbup_num, T3.photo_from, T3.created_at " |
|
| 8 | 8 |
r"from (select * from group_groupuserinfo where user_id='{user_id}' and user_status=1) as T1 "
|
| 9 | 9 |
r"left outer join group_groupinfo as T2 on T1.group_id = T2.group_id " |
| 10 | 10 |
r"left outer join group_groupphotoinfo as T3 on T1.group_id = T3.group_id and T3.id > T1.current_id " |